@@ -885,7 +885,8 @@ def send_trackingNumber_message(order_id, tracking_number):  | 
            ||
| 885 | 885 | 
                },  | 
            
| 886 | 886 | 
                }  | 
            
| 887 | 887 | 
                 | 
            
| 888 | 
                - sendwxasubscribemessage(openid=user.openid_miniapp, template_id=settings.TEMPLATE_ID_TRACKING, data=data, miniprogram_state=None, lang=None, page=None)  | 
            |
| 888 | 
                + res = sendwxasubscribemessage(openid=user.openid_miniapp, template_id=settings.TEMPLATE_ID_TRACKING, data=data, miniprogram_state=None, lang=None, page=None)  | 
            |
| 889 | 
                + order.send_template_message_res = json.dumps(res)  | 
            |
| 889 | 890 | 
                 | 
            
| 890 | 891 | 
                order.save()  | 
            
| 891 | 892 | 
                 | 
            
                @@ -17,7 +17,7 @@ class GoodsInfoAdmin(admin.ModelAdmin):  | 
            ||
| 17 | 17 | 
                 | 
            
| 18 | 18 | 
                 | 
            
| 19 | 19 | 
                class GoodsOrderInfoAdmin(admin.ModelAdmin):  | 
            
| 20 | 
                -    list_display = ('order_id', 'user_id', 'good_id', 'good_type', 'title', 'name', 'phone', 'address', 'tracking_number', 'has_send_template_message', 'integral', 'status', 'created_at', 'updated_at')
               | 
            |
| 20 | 
                +    list_display = ('order_id', 'user_id', 'good_id', 'good_type', 'title', 'name', 'phone', 'address', 'tracking_number', 'send_template_message_res', 'has_send_template_message', 'integral', 'status', 'created_at', 'updated_at')
               | 
            |
| 21 | 21 | 
                     list_filter = ('good_type', 'status')
               | 
            
| 22 | 22 | 
                 | 
            
| 23 | 23 | 
                def save_model(self, request, obj, form, change):  | 
            
                @@ -0,0 +1,21 @@  | 
            ||
| 1 | 
                +# -*- coding: utf-8 -*-  | 
            |
| 2 | 
                +# Generated by Django 1.11.26 on 2021-01-07 14:59  | 
            |
| 3 | 
                +from __future__ import unicode_literals  | 
            |
| 4 | 
                +  | 
            |
| 5 | 
                +from django.db import migrations  | 
            |
| 6 | 
                +import jsonfield.fields  | 
            |
| 7 | 
                +  | 
            |
| 8 | 
                +  | 
            |
| 9 | 
                +class Migration(migrations.Migration):  | 
            |
| 10 | 
                +  | 
            |
| 11 | 
                + dependencies = [  | 
            |
| 12 | 
                +        ('member', '0025_auto_20210107_1834'),
               | 
            |
| 13 | 
                + ]  | 
            |
| 14 | 
                +  | 
            |
| 15 | 
                + operations = [  | 
            |
| 16 | 
                + migrations.AddField(  | 
            |
| 17 | 
                + model_name='goodsorderinfo',  | 
            |
| 18 | 
                + name='send_template_message_res',  | 
            |
| 19 | 
                + field=jsonfield.fields.JSONField(blank=True, help_text='send_template_message_res', null=True, verbose_name='send_template_message_res'),  | 
            |
| 20 | 
                + ),  | 
            |
| 21 | 
                + ]  | 
            
                @@ -9,6 +9,7 @@ from TimeConvert import TimeConvert as tc  | 
            ||
| 9 | 9 | 
                from coupon.models import CouponInfo  | 
            
| 10 | 10 | 
                from mch.models import ModelInfo  | 
            
| 11 | 11 | 
                from simditor.fields import RichTextField  | 
            
| 12 | 
                +from jsonfield import JSONField  | 
            |
| 12 | 13 | 
                 | 
            
| 13 | 14 | 
                 | 
            
| 14 | 15 | 
                class GoodsInfo(BaseModelMixin):  | 
            
                @@ -175,6 +176,8 @@ class GoodsOrderInfo(BaseModelMixin):  | 
            ||
| 175 | 176 | 
                 | 
            
| 176 | 177 | 
                has_send_template_message = models.BooleanField(_(u'has_send_template_message'), default=False, help_text=u'是否已发送模版消息')  | 
            
| 177 | 178 | 
                 | 
            
| 179 | 
                + send_template_message_res = JSONField(_(u'send_template_message_res'), blank=True, null=True, help_text=u'send_template_message_res')  | 
            |
| 180 | 
                +  | 
            |
| 178 | 181 | 
                class Meta:  | 
            
| 179 | 182 | 
                verbose_name = _(u'会员商品订单信息')  | 
            
| 180 | 183 | 
                verbose_name_plural = _(u'会员商品订单信息')  |